Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #19

Merged
merged 56 commits into from
Jun 3, 2024
Merged

Develop #19

merged 56 commits into from
Jun 3, 2024

Conversation

cmaloney111
Copy link
Collaborator

MASSIVE PULL REQUEST!!!!!

cmaloney111 and others added 30 commits May 1, 2024 09:45
@cmaloney111
Merge pull request #6 from sjohn198/main
5cfc207 
Make branches equal
@sjohn198
fixed delete
d103537
@sjohn198
Merge branch 'add_orders' of https://github.com/sjohn198/SafeHaven in…
bbde2ff 
…to add_orders
@sjohn198
Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into …
c500920 
…Develop
@sjohn198
Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into …
0668407 
…Develop
@sjohn198
prettier applied
a4a35d6
@cmaloney111
Add eslint package.json
54baacc
@cmaloney111
Make it so price doesn't increment like quantity
4cfe58e
@cmaloney111
Update README.md
e545b1b
@BrawlPaul
merged with Develop
b5c7a36
@BrawlPaul
added logout functionality
0f3bd09
@sjohn198
manage orders is functional
c5dff3e
@cmaloney111
Add eslint package.json
5be7f26
@cmaloney111
Make it so price doesn't increment like quantity
742f393
@cmaloney111
Change user schema
d28ffb6
@sjohn198
added new files
bc1228f
@sjohn198
Merge branch 'add_orders' of https://github.com/sjohn198/SafeHaven in…
7aee6fc 
…to add_orders
@sjohn198
added search bar file
674f40c
@sjohn198
Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into …
6ad1768 
…Develop
@sjohn198
fixed manage order table
1900423
@RayLui2
Product Pages - No functionality
eb316aa
@BrawlPaul
Separate users added
0d73382
@BrawlPaul
Merge branch 'signup_login' into Develop
2174e6f
@cmaloney111
Mega change for presentation (to add orders and inventory)
940366a
@jkalsi1
jest
b9d1bf4
@jkalsi1
Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into …
1cae489 
…Develop
@jkalsi1
jest files
caf9b60
@jkalsi1
testing started:
111169c
@RayLui2
Editing inventory page
bc0bda7
@RayLui2
Editing inventory page
1594d9a
jkalsi1 and others added 21 commits May 29, 2024 13:37
@jkalsi1
test on Form working
30311de
@cmaloney111
Merge pull request #14 from sjohn198/styling
5c64c3c 
Styling
@cmaloney111
Merge pull request #13 from sjohn198/manage_orders
e051ecc 
works even better
@cmaloney111
Merge pull request #12 from sjohn198/S2inventory
34017fa 
Editing inventory page
@jkalsi1
coverage added to gitignore
1a1ab9d
@RayLui2
Products for Specific ID now
d199813
@BrawlPaul
delete account option + hidden password
9e548ef
@sjohn198
search bar and begin orders for each user
f51e960
@sjohn198
Merge pull request #16 from sjohn198/ProductToUsers
e609718 
Products for Specific ID now
@sjohn198
fixed some conflicts
bb84c40
@BrawlPaul
added profile deletion and profile editing ability
fd237b8
@cmaloney111
Merge branch 'Develop' into edit_profile
076b8e0
@sjohn198
orders for specific ID and search bar
cc35763
@cmaloney111
Merge pull request #18 from sjohn198/add_orders
f40a787 
Add orders
@cmaloney111
Create main.yml
5928266
@cmaloney111
Update main.yml
3ccd66b
@cmaloney111
Add build
47774a0
@cmaloney111
rebuild
c522644
@cmaloney111
Update main.yml
2ee9067
@BrawlPaul
Merge pull request #15 from sjohn198/testing
25a0cfd 
Unit Testing
@cmaloney111
Merge pull request #17 from sjohn198/edit_profile
9db86a6 
Editing Profile + Delete User Profile
@cmaloney111 cmaloney111 requested review from RayLui2, sjohn198, BrawlPaul and jkalsi1 and removed request for RayLui2 and sjohn198 June 3, 2024 16:08
@cmaloney111 cmaloney111 merged commit 7ecf9c0 into main Jun 3, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BrawlPaul BrawlPaul Awaiting requested review from BrawlPaul

@RayLui2 RayLui2 Awaiting requested review from RayLui2

@jkalsi1 jkalsi1 Awaiting requested review from jkalsi1

@sjohn198 sjohn198 Awaiting requested review from sjohn198

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cmaloney111 @RayLui2 @sjohn198 @BrawlPaul @jkalsi1